enhancements (bug fixes + debugging features)