World.java reformatted, other small fixes