Tying up loose ends

Also still working on skybox