map updates, cleanup to outdated API comments