Fixing boolean checks.
Added check methods, not quite done yet.