bugfixes, +rjs