Corrected routes, added counter