Updates And Fixes