Improvements to reporting
* improved tracking of script lines and includes