Merge this please

This is stuff that was missing, it is now here.