modified documentation
merge and removed error producing java stuff