correcting name
more improvements