refixed changes, did some checkup