Fixed warnings and uncommented one new arithmetic optimization from Norman.