some cleanup; bumped the version to 0.2