Fixed debugging issues and format 2.0

Fixed debugging issues and format 2.0