removed testing lines
A lot of improvements, in particular get names from new table.