Minor edits like default cmd and params