Various fixes for red-pill usability