Fix polissoir and lots of reformatting & renaming