changed minor thinks like coments
merge
dunno