fixed more things with name