add new tracking script and re-indent stuff.