various tweaks
0.1.1