Avantika, I've committed and tested both of your patches. Please download the latest code and test them as well. If everything looks good, then you can resolve these issues.
I made some pretty significant changes to the STONEHENGE-84 patch (I've implemented all the validators), hopefully you're okay with the direction I've taken it. -Ben
