Loose ends

last few fixes (eg handling 'study complete')