Debug Info added + some bugfix