Debug Info added and more cleanup