some fixes with finishing