* Fixed conditional address display
* Minor fixes