Migf1 approved

I closed the other request. This one contains only the commits discussed on the forum.