some clean ups and fix showMore