Lots of little bug fixes with the pager, poups