Damn, figured it out.
Well, I figured out item 1 in my post. Seems like when I changed Template type order it also changed the pull down menu "template type" in each templates admin section. Ok that was easy to fix.
Is there some sort of help manual you could steer me towards? Thanks.