Changes to src, arcball hack