small changes
fixes typo
works without inheritence! also tidies stuff