general fixes and additions
0.1.0