Bug Fixes & Performance Improvements