- some style tweaks
- bug fixes