Update for 1.6.4 and new features