Resolve most of Paul's comments