wip fixing bugs