Final pass on questions before push to staging