fixes and add select 'better machine'