Variety of fixes for cut handling; first batch of tests pass