Use "-" for index to skip alignment, misc fixes
Merge