More cleanup and update flagView; minor code format
Bug fix; Document pagination