remove old commented code and enable log message
Allow some more commands to allow specifying an instance
work around for r.mask bug