Patch startstop

This pull request tries to fix issues described in #505.

Please feel free to reword the sentences I used -- they might not be good enough to make sense to their target audience.

Feedback is welcome as always.