new push reverted some fixes added some more