Warts, you might want to share your work with everyone here, not just me - give them the dropbox link of your fixed scenario that you sent me and let us all test it. If it works OK then I encourage you to upload it to the Repository and/or GreenAsJade's so that all community gets access to it.
Thank you.
Edit: It works OK for me.