working out last of upgrade 1.7 kinks