more remat problems fixed.