Some cleanup, bump version to 0.2