fix unary detection
fix broken unary disambiguator fix
clean up logging
update tests and cover new features'