Adding GetAddressMessage. Adding comments and misc cleanup.