Fix flag even more
Change handful of remaining tabs into spaces.