Made a number of alterations in an attempt to handle solar data better.