Formatting fixes, javadoc
Fixed all sorts of weird shit
Fixed more weird shit