More noticable output, change hook answers to c and s
Use output constants when testing output
Merge branch 'more-noticable-output' into develop