fixes and message display