updated pagination & fixing comments