Version 0.1.1.2

Cleanup code, some fixes, comments