Port to java 7. Add manifest. Fix some minor things