added options
fixed bug in command output