minor improvements, ?next works now