fixed small bugz with names