bug fixes regarding time