fix operational flaws