Inter commit
Fix bugs
Change name lenght