more fixes
Stopping