general fixes and currentPage improvements