bug fixing: addresses and routes