fixing files that got screwed up by pull... re-learning :)