Discard, and other improvements