again cosmetics and improvements, final version of sim provider