Fixed stuff. More Java 6 compatibility; why does Apple not update OS X to 1.8u5? :(