a lot of changes of the names. hopefully more correct. now 29/2 not matched.