profile & some fixes