Update comments; change some names