change the name and some fixes