renamed, javadoced, tests added