bugfixes; rf