Implemented final comments (I hope)