added limit; minor fixes