Cleared some options, added descriptions