Master wip/fixes