Implemented map assert and some minor reporting issues.

Signed-off-by: Nikola Olah <nolah@ws048.execom.co.yu>