Fix comment derp to match the actual code
Add support for Pieah