more bool fixes. still needs a little more work