Minor fixes before adding the count/edit functionality