Some big improvements to `otto setup`.