v1.2

added javadoc and debugged program. mostly complete