Some shuffling around and corrections