Comments and Permission fixes/code optimation