More cleanup; Started re-working slides