encapsulation fixes. read me is ok, saving it for release