RS#12: improvements and fixes