Tabulation fix, some minor updates.