Lot of functionality added, major bug fixes, started to write javadoc.