Starting to add default app limit option

Also improving comments