More Fixes And Updates