Option cleanup and help update