fixed minor bugs on the address selection
changed a bit of code in the messages