some minor fixes and niggles