Fixed comments to match up better with Map interface