fixed bugs with names