Add debug info and minor updates