updated lots of crap