Minor changes, file names etc