fucked some shit up, but fixed other :D