Fixes pretty much all, working now