some changes mainly around start/stop