Sounds as if you got rid of several issues related to sitting up and not being used and not properly stored. It also sounds as if you have the mechanical side under control or at least identified. Just like sail boats, things have to be used and maintained, and if not used, and if not stored...