change model, bugfix pagenation, for public release
QA