Several more corrections