Start integrating some of Steve's ost recent round of feedback.