Fixed final stuff and javadoc'd everything!