Small changes and a format file