Rename two IDs, finish Modernizr update, small stuff