Can add name and various bug fixes