java compiler. Some additional changes(not signifficant)