Better boolean handling and more