Some rebuild progress today. Screwed up on the bars, wasn't thinking & got 31.8mm instead of 25.4mm. Oops!
Now on the search for some nice bars. Edit: Found a nice Kalloy UNO flat bar on Ebay.
Also, I did not like the Suntour XC-Expert canti's, so I'm sticking with the Shimano XT's until I find...