Adds missing address handling features<br />Minor bug fixes.