fixing stuff as well as adding stuff