misc updates after takling with Pete