switching to java 7 and adding a bunch o aliases