Moar fixes and textures
Nearly there...