done comment list. fix a few bugs.