fixed bugs and improved performance
Update Classes and Methods and remove deleted ones