Added final changes and comments