fixed some x/y stuff