- minor tweaks
- unit test