Logic Fixes.
Apparently the merge wasn't complete.

Submodules were a terrible idea.
whitespace--