fixed more crap