Updated some code
Updated some comments