Last fixes and tool rename