Initial large change
Various multiple fixes
Remove debug logging