Branch fixes. And/Ors in IFs work (none else work)