added comments
merge shit