Updated checks, relaxed some