housecleaning, fixed restart bugs