- I DID NOT TEST THESE CHANGES, I Don't know if this revision compiles - Merged my code with r21 from Abrasax (I had mistakenly removed some of his changes)