minor style changes and message updates