first some fixes - 1