Lots of updates I guess

I need to be better at separating these out. C'est la vie.