Fixed buggy logic in expire time messages.
Some more message changes.