Fix bugs and Improvements