updates to pagination, buildout of plan