Final bug fixes for Stage 6
Merge branch 'stage6' of https://github.com/ConfuddledPenguin/SimpleShell into stage6
Merge branch 'stage6' of https://github.com/ConfuddledPenguin/SimpleShell into stage6
Merge branch 'stage6' of https://github.com/ConfuddledPenguin/SimpleShell into stage6