[danielandrews43]

Thanks for the advice, makes sense to keep all the bases covered.

Do you have any suggestion as to how I should set up post-contract support?

[vitaminbandit]

Some people will only bill for invalid bug reports (wasting contractor's time). Others will allow X hours free support. Personally, I just charge as I normally would.