all the fixes