More features for nextract
Clean up nextract