Comments and x/y confusion fixes