Changes to rules to fix broken cases

@schmmd Fixing some broken cases- these changes make sense to me but if something looks weird, we can discuss. Please lmk.