Re-enabling project stats. Tidying up imports.