bugfixes in 0.2.1