files needed to compile
Fixed warnings, cleaned up indentation, and other housekeeping