some more major refactoring and cleanup. working on service info, and ssh stuff