More rx-ifying, improvements to rx