updated lots of stuff