Beta 1.7.4

I think this is now mostly stable, so I will merge it to BETA