Added 'two slides per page' version +code cleanup/speedup