Attemping to fix compiler warnings.

Added some code to make compiler warnings go away. Also, emacs automatically stripped away a bunch of unneeded whitespaces.