Converted to C++ comment format & similar. Also got rid of some uncommented code; as we all know, this is the root of all evil... :)
Again, more work towards #2.