Lots of changes

I've lost track and this is madness. Sorry.