update limits and comments per feedback