dep update
improved server handling with stop and stop-all
misc updates