Bug Fixes And Otimizations