Seems that it is working very good this now. Fixing some errors in some places, also updating some unittests