updated lots of things!