Hiya cldsk,
I have made revisions that should meet your needs, - use all, some or none of them as you see fit!
Zip too big for upload here, but you can download if here
I have enclosed a README text file which goes into things a bit.
Hope all goes well, - get in touch if you have problems!
Best,