Improve interface.

Better messages to make what's going on a little clearer.
Make style more uniform.