Fixed inconsistencies with x, y definitions. #7