Changing the path to fit multiple os. Solving some bugs