- up to 0.04.17
- some cleanups