add more evaluations, clean up console command