Fixed issue with sequence points w/comma operator, fixed more error checking.