Fix little bugs. Big refactor and test driven cycle coming!

Signed-off-by: Ben Corlett <bencorlett@me.com>