New files, bugfixes