OP
Octopus
I've only been self employed for a few years and getting to grips with pricing.
Looks like you've got it right.
Priced to make a profit, clear up after you and accomodate a few small changes along the way!
Good man. Do it like this and you'll get recommendations.