Update format to v1.6.1.1

Some modifications for easier debugging were necessary in the process.