Translation updates. Bug fixes. Code clean up.