either linting tidying up, damn you sublime, or removing unused code
few more tests
Support manual restart using "rs" command. Fixes #162