Fixes, code cleanup 0.1.15