Removed unnecessary options, tweaked labels on others