Add checking of more warnings + fix a couple warnings
Strip trailing whitespace