Additional files and tidies up