fixes for sunrise sunset logic