added pagination
small fixes