fixing location of stuff...