Patched stuff up, cleaner now