got rid of unused var
fixed type
killed unnecc line
fixed type
got rid of unnecc var
typo
made const
added assert
Merge origin/master into current branch master
added output to indicate that something should be fixed.
added new switches, but they are commented out.