fix ssh issue, various minor improvements