Fix countdown bug
Minor naming changes