Adding a few features and fixing a few bugs.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Merge commit '821c12f01ecaf79b897980171edff21be5796651' into develop