Final touches with comments