fixes and siphon continuation