Fixes and renaming of single subject demonstration.