fix a bunch of bgs, wip