Fix name and other bugs