Some cleanup, still no refraction :(