Mac fixes, add normals, etc.