Code cleanup and fixed a few issues with the TimerCounter config