beginning of updates for presentation, code clean-up