Additional comments
Fixed few bugs