fix bugs wip