More files & some bugfixes