final bugfixes for 0.1.3