Fixed comments issue, added permalinks