add AMD and CMD support and adjust options a bit