spaces instead of tabs, various fixes