correct names
add tools, small changes