update sunrise function
progress on time conversions
update timezone calculation