Don't set default x and y values, and change some key names