misc fixes
merge stuff??

idk wtf is going on i can't git