Various bugfixes for 0.2.0
Various bugfixes for 0.2.0