formatter, and changed some methods