Clean commands better (comments, etc); switched back to spawn-args