Multiple bugfixes v0.2