Cleanup, extra setup for start script, version bump