More problems solved! Also some improvements.