Issues resolved and messages added