contextual messages added and bugfix.