Some improvments
TODO's Updated