Fix merge
Update to 10.0.1
Add some breaks
Comment-out obsolete stuff