Several important bugfixes
0.10.6