A few updates and suggestions.