New Flattener2, and other updates