Solved some issues with subprocess wrapper names. Minor comments and more cruft removed