fix file stuff
merged