Mayor update

Contains a extensive update of all files.