Updated all files to spec final (i think)