cleaned up workshop agenda, various smaller tweaks