Add Map-Register message
Minor code cleanups
Add better comments to constants