Add startup option, cleanups