cleaned up Riemann_routines more, vortex still works