some oo stuff completed, docs updated, more tests