Inheritance update, docking, Textfield wip, bug fixing