Commit this as thing look OK again
remove some debugging
Final steps...
more