fixing some pagination issues and #43