cleanup and minor fixes

- Clean up ControlServer
- add abort() in main