fixed some names and comments