tidy up and got address working