fix arrows, more new conditions; Maxim