fixing things... kinda