#242 small improvement
#242 add reports + some improvements