format and a bug fix