regression fixes and new work