some rbs improvements and other things