Lots of stuff since last commit, and I can't remember exactly what. It's been a long night