- up to 0.64.2
- some cleanups