adds formatter and fixes