More changes, more fixes... still not working. No idea why.

Life is hard, man.