More files & some fixes