Detect maps automatically
Fix a bug in evaluation mode

Draw is now calculated correctly.