Add polissoir and change lots of stuff