Messages amended and bug sorted.