batch update, fixes from defensive & chemos