Eluna fix boolean checks
Eluna change most checks to new method