Massive Updates

Signed-off-by: Chet Kener <Cl3Kener@gmail.com> (reverted from commit bb043470c78dbc154d0b0984ecc256e1a3adb1ca)