Basically done just a few final tweaks