Fixed an Atom strictness bug and added some query stuff for mapper
Merge branch 'master' into wip_canbind