Fixed issues and modified commenting structures

@rbran100
a)fixed issues 
b)changed commenting structure