Debug of U1

Found some errors
More U1 debug

Oops?