Fixed inconsistent hypens, small data fixes