Commented and added list limiting options