rfm update and some bugfixes