Add more debug help+ some fix of code