first pull

several bug fixes
improvements on child classes