Final Update, I think I get most of them right