implemented various 1.4.7 fixes