minor changes and pagination
date fix