stop implemented and some restart fixes.