wip
plug some fixes