removed namecount, minor fixes after Rahazan's review