fixing stuff as we work