name fixing improved
minor changes