fixes and bare-bone OOP support