1. Bug fix: Address decoding was always disabled. 2. Some cleaning