Got it all sorted now, thanks everyone. Plus, shorts in the post. I even managed to get all the gears to work...a few of them kept slipping or wouldn't engage. They all work just fine now, although on the very top gear there is an ever so slight rattle as the chain just about rubs on the front derailer. It's very minor and I can live with it an no amount of adjustment will change it.
Also, I had some fun with Strava today and beat my personal best which was fun. Sorry, kind of off topic, but does anyone know how to get these segments to show up in the search? Other people's seem to show up, but not mine, although I can see them if I choose a particular ride I went on.