Parallax reserves X co-ordinate.
Merge branch 'Parallax-tweaks'