tighter reporting
added source-map support