Simple update to LOTS of stuff. (Not sure about all the changes)