More code optimization, checks to make sure not to break the system on unusable options