Added more stuff.  Did some code cleanup

Signed-off-by: Daniel Pierce <paladin2350@gmail.com>