some updates to CMD