updated pretty much everything