Improved questionnaire layout (pilot), correcte minor things in SK shave