some fixes - 1