push from presentation

with weird little tweaks eeverywhere