Misc changes and version 0.2