updated with new files
structure for list added and more explicit comment. defines OPT changed