Custom number of items. Minor bug fixes.