fixes indentation issues

and some compilations issues on Linux