Some improvements
Improve status command