Add paging + api endpoints + more stuff
Some minor improvements