new oneshot command, other cleanups, oh, no more curl, maybe