Cleaned last merge.
Fixed a huge mess of things from former merges. - Aaron Weiss