fixing stuff from Flo, that I destroyed. sorry!