updated lots of shit