mostly small tweaks to fix Claire's bug
mostly small tweaks for Claire's bug