Tweaks to fix bugs. Still needs work to be prettier.
Signed-off-by: Chris Mullen <cbmullen@gmail.com>