Fixes fixes and fixes

UpperKEES debbugger tool.