replaced tabs by spaces, added missing packages.