Make human detection more robust

Requires more testing, I guess