I'd love to see your prompts for this work. Both issues seem to be easily solved and minor - unless you're looking to one prompt every change.