Once more fixed incorrect map transitions.
Clean up log/debug messages.