Fixed the following Behavior.

Also added some more functionality for some classes, and some
convenience methods.