Added "advanced options" and some comments