Lowered the limit, tweaked the code slightly.