Change to Java 7 and clean up warnings

+ (due to SNAFU) some changed classes for NPCs