some messaging updates and some ui improvements