Cleaning up, still bug with counts