some fixes with spaces and tabs.