Merging Damiens work

tried merging damiens updates, but git said I had to commit my changes
or else I would lose them. This commit can be disregarded.