Bug hunt and Improvements