changed several time conversion funcs