more changes towards new version of oooJava