Various tweaks
1.0.1