Several fixes, resubmission after rejection working.