fix wip bugs