General big update (I lost the track of changes, but you can see the main ones comparing the files, sorry).