New stopping rules, some fixes here and there