Numerous changes.
Updated deck