Cleaned up the options and bumped the version