Repair \n Bug and add comment functions