some fixes to normals etc