Crash Fixes & Performance Improvements