added name validation and squashed bugs