Added some "static" content and tweaks from dress rehearsal