Fixing names, improving time functions