major bugfixes in 0.0.5 alpha