temp fix on address + bunch of error handling