More cleanup. Change some more BOOLs over among other things.