cleanup_again

More changes. See changelog for vsn 0.0.3