added diameter, changed diatonic flag to -D