After Crash frame fixes

This frame is part of the way through fixing the issues I am gaving when
flying this frame.