push some fixes to mistakes