like to add more from Ident and Pretty but keeped minimal changes in those files. TODOs to be discussed.
