minor changes (cleaned up message logging)