big update, better formalization for pegsol