Fixed some error caused by change to struct
Formated code
Added new debug watchers