Fixes
Rewrote whole shizz