Improvedreportingtemp

branch for better parsing features
long line, please break it up