New files, style fixes