various changes - bringing the git up to date

Signed-off-by: Matthew Herod <matthew.herod@gmail.com>