fixing DB commits and message layout