Probably Fixed rectangular griddiness

Were using wrong x and y vars