Add trace-count watch
Code formatting
Update compiled JS
Merge branch 'trace-count' into develop