Possibly cleared up some file overwriting issues.