fix a bunch of stuff... hopefully