s/int/bool
more review comments
wip