updated java path, changed path
merged..