Remove pragmas that should not be + some small fixes and improvement
docs