Add normals, lighting back in, clean code a bit