more fixes changes more mass readding to 4.3 base