Changed items from Lee's review suggestions.