Some editing and add a TODO for documenting special usage
of functions of type boolean.