major bugfixing on 0.1 release