done fixing stuff