fixed things in the right place :)