Fixed up some links and capitization