fixes and file cleaning