more fixes with the inheritance and more to come