General Updates And Fixes