Bug Fixes

This was taken piece-meal out of another project, as such I had some project-specific code in there.  Just…gonna go ahead and remove that.

Signed-off-by: Daniel Carbone <daniel.p.carbone@gmail.com>