cleaned up the files (and removed tons of warnings)