Lots of changes for ending

working out last of the math and logic qustions/order of questions.