Yup thats exactly what happened and how I had to get it back together.
Thanks for the info on the BB for the aperture click.. I may have an extra one laying about but im not sure its the right size. i definately dont have a springg though. Oh well no matter.