reformat
finished a thorough revision of new and old results