corrections with the output and added proper commands

jira issue: wp-829

corrections with the output and added proper commands and return values