fixing messaging issues - text not appearing and wrong names
fix merge conflict