A few updates and suggestions.

See notes below as well.