formatter
fixed 2 bugs