Added jdk7-oracle. Also a few other things