Bugs and adding name validation