Formatted all code to Java 7, DO NOT use .*; for any imports, that's a bad habit to get into, fixed errors