added bunch of details to  the format
renaming
renaming
minor fixes