add/fix safeguards, make safeguards more tolerant