merge prep
parallax implemented; no-jumping available