Adjustments with quick style fixes.

Resolves #167 & #154 along with some visual bugs.

@angaither 

CC: @barryclark @DFurnes