Minor fixes plus added start of the new format