various RMF cleanups and speedups