Final Updates

Signed-off-by: Chris <cdesch@gmail.com>