Various changes and removed extra info from session cutting options