updated a bunch of crap

updated