fuck me
merge with tyler_fix
some more fixes