1.6 updates and bug fixes