Fixed some stuff, added also, for reporting