Modified and Debugged some errors
Check out some new changes