Added user ignoring & small stuff