Did some streamlining. (Hopefully) fixed the issues with booleans