improve and fix checks

• split up ifs to avoid unnecessary json object work
• match against names (picked the wrong property there initially)
• add some comments to explain what's going on