minor fixes to cue final pass