fix pagination bug. clean up old comments