Bug clean up.  Everything should be working fine now.

Signed-off-by: Verse <micalcjr@gmail.com>