Adding count, fixing misc