improvements for DevCmd
fix