Fixing boolean function checks, moving checks out of fs.sh