updated a bunch of stuff
post pull update