Fix a few issues
Bunch of small fixes. Starting rewrite.
Almost have it!
whywontuwork