3.7.16 plus several fixes