Added some comments and options splited by sections