Some fixes

Formatted Painis Cupcake.