yank useless comment
Add missing gather parameters
Fix cal table subset expression