Cleanup, and add user options