Fix bug and update messages