Cosmetic changes and bug fixes in watchthis.c
Merge branch 'rshell'
Merge branch 'rshell'