Minor transaction handling tweak + comments