Bug fixes and changes to implementation

Improvement to support paging. Making use of riaktive's new mutate call. Bug fixes.