Added crude name to city matching

I don't tcl much. But when I do, it's horrible mess...  
Also added new variables such as kosteus, nakyvyys, etc.