improves and fixes for commands