wip minor fixes