indent with spaces, not tabs
resolve a few warnings