Pyroma status: Mascarpone.
Removed redundancy in naming.
Some documentation (plus testing of it, of course).