fix errors and remove pagination