Fixed issues, added map and reports