fixing all kinds of stuff