Massive updates

I should be committing more properly! :(