Adding count section and fixing some mistakes