more sofia updates
bump to java 1.7
fix ordering issue