more work on entity scanning
add more entities to validScan list