Add cuts
Various updates
Fix merge conflicts