Cleanup, bugfix in start()