Commands added, Shell & ShellMain improved