push some fixes