fixes from bad merge; bumping to 3.2.0-rm2