varius fixes and stuff (worst commit msg ever, i know)