Lots of changes

I've been away for a while and I have no idea what changed