Fixes And Updates