small changes + tryharding for lazy rules