fix for #8 and #9; fix time ranges on x axis