Final polish

Latest final-polish closes #1035