Address most of Mike's PR review comments