fixes to Albert's comments