Changed error handling
minor changes
Removed parts of the AddressAnswer functionality temporarily since it gave runtime errors