update for merge (removed stopManager), and fixes for spec tests, and misc minor other usability fixes