Updated comments
Updated documentation