Add super-debug feature to better debuging.
Improvment and Cleanup source code