#21 some fixes and improvements
#21 working on reports