Some examples and cleanup/refresh a few states.

A bunch of changes I found useful or cleaner, feel free to accept or reject.