several changes

Signed-off-by: Daniel Berry <danielberrytn@gmail.com>
fixes

Signed-off-by: Daniel Berry <danielberrytn@gmail.com>