Fixed and javadoced