Named things more clearly.
Added a couple features.