Added option to bypass localization (for improved performance).
Various whitespace fixes.