some fixes, but not enough to really fix it yet..