Fixes and added report