Fix several oversights and typos
Support the delegate in setup-for