finished fixes - F