Additional files and misc updates