main commits

there is a few things for change