fill in feedback message handler, minor cleanup