Updated/rewrote comments template