squash some bugs, fix False/false