Fixing careless mistakes and nit-picks!

Small mistakes, trailing whitespace, forgotten equal signs, etc.