Edits as requested by @Diaoul

Added Java.conf and additional changes.