Lotsa updates

I'm not in the mood to list them all