renamed stuff. fixed the fuckups