Fix names in messages, and max balance check