fix time module calls and var names