Upstream merge, README clarification, proper destruction (hopefully).