Fixed some bugs + added more report