Address mostly editorial issues pointed out by Bernie V.