Add Java path
Misc updates