most of the fixes