Add new resume options; partially implemented, fix walk bug