Shorter column names. Misc fixes.