Finalized changes and comments