Added more docs
Updated comments