clean constants messages; little fixes