fixed standards
fixed includes
updated the counters