update to 1.6.4 including 1.6.3 changes