Review, pass 1

Please review the changes and let me know if they make sense.