General Updates & Fixes