Fixed update bugs wip