Added variable watch commands; improved error function