comment stuff and some name stuff is added