fixes and message display from master