Changed default number to 15 from 20, added code to help scale the app