cupe fixes, comments galore