Some more renaming.
Added some comments.
Fixed xUnit runner.