Made som changes and addition, mainly for the sun warming pump, CP2