move videos into main section, do a lot of formatting cleanup! BEWARE THE DIFF