Minor changes

Made it possible to choose between the original implementation of the
physics, or the new improved one.