fix comment
change some method naming...make sense.