More cleanup.  Return false instead of 0 for bool functions.
Finish cleaning up