Added experimental Next page & minor bug fixes