Added addresses and basic cleanup