This version includes all your adjustments plus my additions. Everything should be fixed now.