Many updates...

Signed-off-by: Conrad Haupt <conradjhaupt@gmail.com>