Add comment goodness to modules
Apply patch