minor changes

p.s.: pls read my comments in some of the files. thanks.