Another bunched commit.

I will try to keep on top after this