Added an optimization flag I forgot about and had been meaning to add for some time - also did a LOT of code cleaning.