minor tweaks with checking rules