Updated comments and documetnation