Add /end command and fix checks for /start