Cleanup
Fixes main piece lookup for rolls of 19.