added changes to sh/sun and sh/moon from Steve Franke K9AN