Code clean up, fixed tests, updated versions.
Prepare development on 1.7