added cut-gaps, some stuff from contrib, and now stage directions are cleaner I on most; all unconfirmed.