Add debug when start command
FIX commands problems
Cleanup