.
all the fixes