Some edits, pagination should work now, lots of todos todo :)