Stable upload 3

Recopied all files
Minor tweaks
Today's final