Disambiguation Fix comments

Added some comments to the code.
Arena changes no 5

A lot of small changes; seems to be ready now.