added some comments and removed deprecated options