Stability  & Formatting Improvements