- fixed issue with some helper functions not returning false
- fixed issues with some functions not returning false