merge in updates from Thomas and Brian
DQM displays and small mapping fix
small cleanup
bob/thomas updates